Skip to content

Revert "[Kernel] Expand MoE weight loading + Add Fused Marlin MoE Kernel (#7527)" #7764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
mgoin merged 1 commit into from
Aug 22, 2024
Merged

Revert "[Kernel] Expand MoE weight loading + Add Fused Marlin MoE Kernel (#7527)" #7764

mgoin merged 1 commit into from
Aug 22, 2024

Conversation

@mgoin
Copy link
Member

@mgoin mgoin commented Aug 22, 2024

This reverts commit 8678a69 from PR #7527 since it causes a failure in the AMD build

_bk;t=1724282628542 #18 286.2 [6/22] Building HIP object CMakeFiles/_moe_C.dir/csrc/moe/marlin_moe_ops.hip.o
_bk;t=1724282628542 #18 286.2 FAILED: CMakeFiles/_moe_C.dir/csrc/moe/marlin_moe_ops.hip.o 
_bk;t=1724282628542 #18 286.2 /opt/rocm/llvm/bin/clang++ -DPy_LIMITED_API=3 -DTORCH_EXTENSION_NAME=_moe_C -DUSE_C10D_GLOO -DUSE_C10D_NCCL -DUSE_DISTRIBUTED -DUSE_PROF_API=1 -DUSE_RPC -DUSE_TENSORPIPE -D__HIP_PLATFORM_AMD__=1 -D__HIP_ROCclr__=1 -D_moe_C_EXPORTS -I/vllm-workspace/csrc -isystem /opt/conda/envs/py_3.9/include/python3.9 -isystem /opt/conda/envs/py_3.9/lib/python3.9/site-packages/torch/include -isystem /opt/conda/envs/py_3.9/lib/python3.9/site-packages/torch/include/torch/csrc/api/include -isystem /opt/rocm-6.1.2/include/hiprand -O2 -g -DNDEBUG --offload-arch=gfx908 --offload-arch=gfx90a --offload-arch=gfx942 --offload-arch=gfx1100 -fPIC -fPIC -D__HIP_PLATFORM_AMD__=1 -DUSE_ROCM=1 -DHIPBLAS_V2 -DCUDA_HAS_FP16=1 -D__HIP_NO_HALF_OPERATORS__=1 -D__HIP_NO_HALF_CONVERSIONS__=1 -DUSE_ROCM -DENABLE_FP8 -U__HIP_NO_HALF_CONVERSIONS__ -U__HIP_NO_HALF_OPERATORS__ -fno-gpu-rdc -mllvm=-amdgpu-early-inline-all=true -mllvm=-amdgpu-function-calls=false -D_GLIBCXX_USE_CXX11_ABI=0 -DTORCH_HIP_VERSION=601 -Wno-shift-count-negative -Wno-shift-count-overflow -Wno-duplicate-decl-specifier -DCAFFE2_USE_MIOPEN -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_HIP -std=c++17 -DHIP_NEW_TYPE_ENUMS -MD -MT CMakeFiles/_moe_C.dir/csrc/moe/marlin_moe_ops.hip.o -MF CMakeFiles/_moe_C.dir/csrc/moe/marlin_moe_ops.hip.o.d -o CMakeFiles/_moe_C.dir/csrc/moe/marlin_moe_ops.hip.o -x hip -c /vllm-workspace/build/temp.linux-x86_64-cpython-39/csrc/moe/marlin_moe_ops.hip
_bk;t=1724282628693 #18 286.2 /vllm-workspace/build/temp.linux-x86_64-cpython-39/csrc/moe/marlin_moe_ops.hip:1538:5: warning: ignoring return value of function declared with 'nodiscard' attribute [-Wunused-result]
_bk;t=1724282628693 #18 286.2  1538 |     hipDeviceGetAttribute(&sms, hipDeviceAttributeMultiprocessorCount, dev);
_bk;t=1724282628693 #18 286.2       |     ^~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_bk;t=1724282628693 #18 286.2 /vllm-workspace/build/temp.linux-x86_64-cpython-39/csrc/moe/marlin_moe_ops.hip:1595:3: warning: ignoring return value of function declared with 'nodiscard' attribute [-Wunused-result]
_bk;t=1724282628693 #18 286.2  1595 |   hipDeviceGetAttribute(&max_shared_mem,
_bk;t=1724282628693 #18 286.2       |   ^~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
_bk;t=1724282628693 #18 286.2  1596 |                          hipDeviceAttributeMaxSharedMemoryPerBlock, dev);
_bk;t=1724282628693 #18 286.2       |                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_bk;t=1724282628693 #18 286.2 /vllm-workspace/build/temp.linux-x86_64-cpython-39/csrc/moe/marlin_moe_ops.hip:1649:7: error: no matching function for call to 'hipFuncSetAttribute'
_bk;t=1724282628693 #18 286.2  1649 |       CALL_IF_MOE(16, 4, 256)
_bk;t=1724282628693 #18 286.2       |       ^~~~~~~~~~~~~~~~~~~~~~~
_bk;t=1724282628693 #18 286.2 /vllm-workspace/build/temp.linux-x86_64-cpython-39/csrc/moe/marlin_moe_ops.hip:1499:3: note: expanded from macro 'CALL_IF_MOE'
_bk;t=1724282628693 #18 286.2  1499 |   __CALL_IF_MOE(1, N_BLOCKS, K_BLOCKS, true, 0, NUM_THREADS)   \
_bk;t=1724282628693 #18 286.2       |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_bk;t=1724282628693 #18 286.2 /vllm-workspace/build/temp.linux-x86_64-cpython-39/csrc/moe/marlin_moe_ops.hip:1408:5: note: expanded from macro '__CALL_IF_MOE'
_bk;t=1724282628693 #18 286.2  1408 |     hipFuncSetAttribute(                                                     \
_bk;t=1724282628693 #18 286.2       |     ^~~~~~~~~~~~~~~~~~~
_bk;t=1724282628693 #18 286.2 /opt/rocm/include/hip/hip_runtime_api.h:2143:12: note: candidate function not viable: no overload of 'MarlinMoE' matching 'const void *' for 1st argument
_bk;t=1724282628693 #18 286.2  2143 | hipError_t hipFuncSetAttribute(const void* func, hipFuncAttribute attr, int value);
_bk;t=1724282628693 #18 286.2       |            ^                   ~~~~~~~~~~~~~~~~

@github-actions
Copy link

github-actions bot commented Aug 22, 2024

👋 Hi! Thank you for contributing to the vLLM project.
Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which consists a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of default ones by unblocking the steps in your fast-check build on Buildkite UI.

Once the PR is approved and ready to go, please make sure to run full CI as it is required to merge (or just use auto-merge).

To run full CI, you can do one of these:

  • Comment /ready on the PR
  • Add ready label to the PR
  • Enable auto-merge.

🚀

@mgoin mgoin added the ready ONLY add when PR is ready to merge/full CI is needed label Aug 22, 2024
@mgoin mgoin enabled auto-merge (squash) August 22, 2024 02:05
@mgoin mgoin merged commit aae74ef into main Aug 22, 2024
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
@mgoin @Alvant
Revert "[Kernel] Expand MoE weight loading + Add Fused Marlin MoE Ker…
94d2738 
…nel (vllm-project#7527)" (vllm-project#7764)

Signed-off-by: Alvant <[email protected]>
@simon-mo simon-mo deleted the revert-marlin-moe branch October 28, 2024 16:51
LeiWang1999 pushed a commit to LeiWang1999/vllm-bitblas that referenced this pull request Mar 26, 2025
@mgoin @LeiWang1999
Revert "[Kernel] Expand MoE weight loading + Add Fused Marlin MoE Ker…
2592c27 
…nel (vllm-project#7527)" (vllm-project#7764)

Signed-off-by: LeiWang1999 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@robertgshaw2-redhat robertgshaw2-redhat robertgshaw2-redhat approved these changes

Assignees

No one assigned

Labels

ready ONLY add when PR is ready to merge/full CI is needed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mgoin @robertgshaw2-redhat